listitemmanager: Remove unused functionality

Both ListView and GridView use GtkListTile now, so no need anymore for
custom machinery.

diff --git a/gtk/gtkgridview.c b/gtk/gtkgridview.c
index 4980bed78d010fffa142aa6a00ad40baf01cf37d..e5a440f74a5f6cd3918770847d004c27e70a825c 100644 (file)
--- a/gtk/gtkgridview.c
+++ b/gtk/gtkgridview.c
@@ -813,9 +813,6 @@ gtk_grid_view_class_init (GtkGridViewClass *klass)
 
   list_base_class->list_item_name = "child";
   list_base_class->list_item_role = GTK_ACCESSIBLE_ROLE_GRID_CELL;
-  list_base_class->list_item_size = sizeof (GtkListTile);
-  list_base_class->list_item_augment_size = sizeof (GtkListTileAugment);
-  list_base_class->list_item_augment_func = gtk_list_item_manager_augment_node;
   list_base_class->get_allocation_along = gtk_grid_view_get_allocation_along;
   list_base_class->get_allocation_across = gtk_grid_view_get_allocation_across;
   list_base_class->get_items_in_rect = gtk_grid_view_get_items_in_rect;

diff --git a/gtk/gtklistbase.c b/gtk/gtklistbase.c
index 5b1af350c31652bb3968301852c5dee865035b78..0392abd37b79f30a3e61442e65175f879e3dc021 100644 (file)
--- a/gtk/gtklistbase.c
+++ b/gtk/gtklistbase.c
@@ -1877,12 +1877,9 @@ gtk_list_base_init_real (GtkListBase      *self,
   GtkListBasePrivate *priv = gtk_list_base_get_instance_private (self);
   GtkEventController *controller;
 
-  priv->item_manager = gtk_list_item_manager_new_for_size (GTK_WIDGET (self),
-                                                           g_class->list_item_name,
-                                                           g_class->list_item_role,
-                                                           g_class->list_item_size,
-                                                           g_class->list_item_augment_size,
-                                                           g_class->list_item_augment_func);
+  priv->item_manager = gtk_list_item_manager_new (GTK_WIDGET (self),
+                                                  g_class->list_item_name,
+                                                  g_class->list_item_role);
   priv->anchor = gtk_list_item_tracker_new (priv->item_manager);
   priv->anchor_side_along = GTK_PACK_START;
   priv->anchor_side_across = GTK_PACK_START;

diff --git a/gtk/gtklistbaseprivate.h b/gtk/gtklistbaseprivate.h
index 2d4fb23e1ac115a2b3f5fcb3abb3dc27a75e6576..af70843c401d2709c8cb71c04b0e24e39524ccb0 100644 (file)
--- a/gtk/gtklistbaseprivate.h
+++ b/gtk/gtklistbaseprivate.h
@@ -36,9 +36,6 @@ struct _GtkListBaseClass
 
   const char *         list_item_name;
   GtkAccessibleRole    list_item_role;
-  gsize                list_item_size;
-  gsize                list_item_augment_size;
-  GtkRbTreeAugmentFunc list_item_augment_func;
 
   void                 (* adjustment_value_changed)             (GtkListBase            *self,
                                                                  GtkOrientation          orientation);

diff --git a/gtk/gtklistitemmanager.c b/gtk/gtklistitemmanager.c
index 608a9fd76ff829c177a3b16d17bd2086a73af413..a1e9e0559518d4731a0a0de3c2244b8022af1275 100644 (file)
--- a/gtk/gtklistitemmanager.c
+++ b/gtk/gtklistitemmanager.c
@@ -90,7 +90,7 @@ potentially_empty_rectangle_union (cairo_rectangle_int_t       *self,
   gdk_rectangle_union (self, area, self);
 }
 
-void
+static void
 gtk_list_item_manager_augment_node (GtkRbTree *tree,
                                     gpointer   node_augment,
                                     gpointer   node,
@@ -129,18 +129,13 @@ gtk_list_item_manager_clear_node (gpointer _tile)
 }
 
 GtkListItemManager *
-gtk_list_item_manager_new_for_size (GtkWidget            *widget,
-                                    const char           *item_css_name,
-                                    GtkAccessibleRole     item_role,
-                                    gsize                 element_size,
-                                    gsize                 augment_size,
-                                    GtkRbTreeAugmentFunc  augment_func)
+gtk_list_item_manager_new (GtkWidget         *widget,
+                           const char        *item_css_name,
+                           GtkAccessibleRole  item_role)
 {
   GtkListItemManager *self;
 
   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-  g_return_val_if_fail (element_size >= sizeof (GtkListTile), NULL);
-  g_return_val_if_fail (augment_size >= sizeof (GtkListTileAugment), NULL);
 
   self = g_object_new (GTK_TYPE_LIST_ITEM_MANAGER, NULL);
 
@@ -149,9 +144,9 @@ gtk_list_item_manager_new_for_size (GtkWidget            *widget,
   self->item_css_name = g_intern_string (item_css_name);
   self->item_role = item_role;
 
-  self->items = gtk_rb_tree_new_for_size (element_size,
-                                          augment_size,
-                                          augment_func,
+  self->items = gtk_rb_tree_new_for_size (sizeof (GtkListTile),
+                                          sizeof (GtkListTileAugment),
+                                          gtk_list_item_manager_augment_node,
                                           gtk_list_item_manager_clear_node,
                                           NULL);
 

diff --git a/gtk/gtklistitemmanagerprivate.h b/gtk/gtklistitemmanagerprivate.h
index d5ee20fc6a55de7a68210332e386cc310dc089b1..14d058a377a17207c4360638b3b96f57b2241f8b 100644 (file)
--- a/gtk/gtklistitemmanagerprivate.h
+++ b/gtk/gtklistitemmanagerprivate.h
@@ -61,20 +61,10 @@ struct _GtkListTileAugment
 
 GType                   gtk_list_item_manager_get_type          (void) G_GNUC_CONST;
 
-GtkListItemManager *    gtk_list_item_manager_new_for_size      (GtkWidget              *widget,
+GtkListItemManager *    gtk_list_item_manager_new               (GtkWidget              *widget,
                                                                  const char             *item_css_name,
-                                                                 GtkAccessibleRole       item_role,
-                                                                 gsize                   element_size,
-                                                                 gsize                   augment_size,
-                                                                 GtkRbTreeAugmentFunc    augment_func);
-#define gtk_list_item_manager_new(widget, item_css_name, type, augment_type, augment_func) \
-  gtk_list_item_manager_new_for_size (widget, item_css_name, sizeof (type), sizeof (augment_type), (augment_func))
-
-void                    gtk_list_item_manager_augment_node      (GtkRbTree              *tree,
-                                                                 gpointer                node_augment,
-                                                                 gpointer                node,
-                                                                 gpointer                left,
-                                                                 gpointer                right);
+                                                                 GtkAccessibleRole       item_role);
+
 void                    gtk_list_item_manager_get_tile_bounds   (GtkListItemManager     *self,
                                                                  GdkRectangle           *out_bounds);
 gpointer                gtk_list_item_manager_get_root          (GtkListItemManager     *self);

diff --git a/gtk/gtklistview.c b/gtk/gtklistview.c
index 65fce34dbfd054df98814a074336f67c9fb26058..ee3a0bbc6a050bbb742cbf430843bad4e4f44ff8 100644 (file)
--- a/gtk/gtklistview.c
+++ b/gtk/gtklistview.c
@@ -663,9 +663,6 @@ gtk_list_view_class_init (GtkListViewClass *klass)
 
   list_base_class->list_item_name = "row";
   list_base_class->list_item_role = GTK_ACCESSIBLE_ROLE_LIST_ITEM;
-  list_base_class->list_item_size = sizeof (GtkListTile);
-  list_base_class->list_item_augment_size = sizeof (GtkListTileAugment);
-  list_base_class->list_item_augment_func = gtk_list_item_manager_augment_node;
   list_base_class->get_allocation_along = gtk_list_view_get_allocation_along;
   list_base_class->get_allocation_across = gtk_list_view_get_allocation_across;
   list_base_class->get_items_in_rect = gtk_list_view_get_items_in_rect;